Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 31 May 2011 05:45:07 +0000 (22:45 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 31 May 2011 05:45:07 +0000 (22:45 -0700)
commit2bbceb8068922ce572b01ebdf6f9f4589c138b45
tree694b603eee1476715aa9d6b88fada00536bcfbed
parent5fa44af729cd73efd5a0f6d6c513f0fa17d4a106
parent7fad7bd16ef5c02fc05a9003d110aeee45e89198
Merge from trunk.
ChangeLog
src/ChangeLog
src/alloc.c
src/lisp.h
src/minibuf.c
src/xterm.c